-
Notifications
You must be signed in to change notification settings - Fork 92
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
First update of upstream master (v3) into our own master branch. #81
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add brewing supply store preset
(the one breaking change from v2.0.0)
…be subway, light rail, etc. Use the "station" tag to add public transport type tags like "subway=yes" (close #6948)
…their derived data
Remove "terms" property from all unsearchable presets and fields and their derived data
# Conflicts: # dist/locales/en.json
For new brands added in name-suggestion-index v3.3.0
Update various preset icons for temaki 2.3.0 Add term to stable preset Increase matchScore of Boatbuilder preset
# Conflicts: # data/presets/presets.json # data/taginfo.json
Deprecate amenity=research_institution
# Conflicts: # modules/ui/preset_list.js
Adding this field in the main ones, just like for street crossings, as it is very important for accessibility and safety.
add tactile paving to steps
Adding this field in the main ones, just like for street crossings, as it is very important for accessibility and safety.
Update uglify-js to 3.7.1 (close #7065) Update mapillary-js to 2.20.0 (close #7060)
Add Access Aisle preset and rendering (close #7083)
Id v3 merge 2
Deprecate power=marker
… #7085) Add documentation note about `prerequisiteTag` property getting ignored if a value is present
Add US-only field for `gnis:feature_id` (close #7086) Add tooltip to wikipedia field link button
# Conflicts: # data/presets/presets.json
Merge master with latest v3 code from upstream.
Merge master with latest v3 code from upstream.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In an attempt to get our master branch in sync with the upstream iD master branch (which is for iD v3 development) this is our first merge of that code.
An internal build of this code has been in use for a couple of months and appears stable.